From acca018e57c0cdf95d952481437c7059695219ee Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 20 Dec 2011 18:42:27 -0500 Subject: [PATCH] ostbuild: Ensure private libraries are in runtime, and kill .la files A regular libfoo.so not in one of the regular directories should go in runtime. (Probably we should double check it's a regular file too). Also, delete .la files unconditionally. --- src/ostbuild/ostbuild-compile-one-impl | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/ostbuild/ostbuild-compile-one-impl b/src/ostbuild/ostbuild-compile-one-impl index 1a8ac540..1b46810f 100755 --- a/src/ostbuild/ostbuild-compile-one-impl +++ b/src/ostbuild/ostbuild-compile-one-impl @@ -26,11 +26,16 @@ import select,time tempfiles = [] +_blacklist_regexps = map(re.compile, + [r'.*\.la$', + ]) + _devel_regexps = map(re.compile, [r'/usr/include/', r'/usr/share/pkgconfig/', - r'/.*lib(?:|(?:32)|(?:64))/pkgconfig/.*\.pc', - r'/.*lib(?:|(?:32)|(?:64))/.*\.so$']) + r'/(?:usr/)lib(?:|(?:32)|(?:64))/pkgconfig/.*\.pc$', + r'/(?:usr/)lib(?:|(?:32)|(?:64))/[^/]+\.so$' + ]) root = None @@ -289,6 +294,16 @@ def phase_make_artifacts(builddir=None): for root, dirs, files in os.walk('.'): for filename in files: path = os.path.join(root, filename) + + blacklisted = False + for r in _blacklist_regexps: + if r.match(path): + blacklisted = True + break + + if blacklisted: + continue + matched = False for r in _devel_regexps: if not r.match(path[1:]): -- 2.30.2